WIP: Legacy testsuite cleanup

I'm fine to fix spelling and/or rename stuff once zion says it builds :-)