fixed: tests + testsuite