Wrote a few more tests.