Adding a few more unit tests.