More tests, more code to make them pass