Attempt to fix broken test - Do not merge to next