Some more tests for tricky edge cases
Lose the camelcasing, make it more Vala-like
Fix typo in comment for compare