trivial fixes to discovered class tests
tests improvement