Running the tests is now more modular allowing easy modifications