Move the testsuite classes back to src/test