More tests converted

And fix one test.