More simplification of the tests