minor cleanup of test classes