Added fix for spurious test failures with ecs