Move testsuite entries to proper file