WIP: More legacy testsuite cleanup

Throwing away more junk