Some tests are now passing