changed the tests to be more modular