More unit tests to complete the test coverage