Add more unit test coverage