More tests are now converted