Merge "Split up doOperations() test to be more robust when tests fail."