More tests

Added a few more unit tests.