Testingcleanup2

Various test cleanups. Lots of static imports, some utility methods added, some simplifications to prevent duplication.