Simplify the tests