Simplify unit tests