Simplify negative tests
Rename class