Tests are all passing now