More tests are now passing