Converted 2 more tests.
Another test.
Merge pull request #92 from Hudon/2-more-tests

Converted 2 more tests.