WIP: Legacy testsuite cleanup