Fix cms tests after merge from master