Acceptance test fix following Controller renaming