Increase unit test coverage