CLC-4049: Fixing tests for future tasks