Adjusted a few tests that declare a class to do so lexically.