rename testsuite filename to use actual names. and use def suite.