Write more tests, make them pass