Implement new testsuite