cleanup of testsupport and test from old structure