Added test coverage