Fix tests after the mv requirement was lifted from the deployer bar and canvas switcher