Unittests: use generic test classes where possible
Unittests: make unit test output more specific and unambiguous
Regressions: also use generic classes