MCOP-69 Update mocks and cows for current build set