Updated the testsuite for the new structure