Converting over a few more tests.