Task #1360, test failures resolved