All tests are green by now