Most tests are now passing