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