Updating the API to the new API

JAVA-1325
When the tests change the operation then we keep it DRY by using a var.  This pattern is used 19 times in this file.