Add more tests and use eql for readability