Broke down test suite to make it easier to test