converted a few more tests