Add classname to testcase trait error message
Reformat a test class slightly to make it easier to read.