Unify certain portions of the tests