Merge "Simplify unit tests"