Update test
Remove comparison operators that are too specific
Add comparison case-specifiers

"case-specifiers"? is that the right thing to call these?