Changed the way tests are performed