Follow up to fix tests to pass for both 1.9 and 1.10 - REPORT-640