Added a couple of other unit tests.