Test coverage improvements