Add equality tests
Reorder and reword TODOs