Now the tests are almost working.