Merge "Add tox job for serial testr"