Update tests to work with the new testsuite