Simplifying the tests