Tests are green now