CORE-1294 Test failures trying to build 2_0_x branch

Fixed tests not updated with recent code changes