Converted 2 more tests.

More tests passing.