Changed the way that tests are built