Re-structured Testsuite