Updated test coverage