Some alignment of mock_api with jenkins_api