Fixing caption tests after a9213509c