Convert more tests