restructuring testsuite