Operation test coverage improvements