Updated test coverage to match implementation