fix a02c21d: Test class naming + more compact tests