Refactored the testsuite code with the hope in mind to make the test suite run faster