Move more tests to the new testsuite