Unify unit tests