Add some unit tests

Add some unit tests to increase test coverage.