More unit tests

Added a couple of more unit tests, added a few test cases to existing ones.