Continue to simplify the tests