Added support for testsuite (#602)