TD-4231 Seven test failures on develop branch