Work on adding fixture support to testsuite