make the testsuite talk
restructure internally