tests: merged some testsuite fixlets