Fix test class declarations

Based on an email conversation, this may be a solution without a problem (for everyone else.)

Submitting this, just in case it isn't.