Changed the tests to simplify