removed obsolete test classes, more streamlining, ...