[WIP] Starting migrating testsystems to new style