Simplify tests
0.6.0