Changed the way that tests work