Merge "Fix tests for bug 1656183"