impl/EZP-22163 minor changes in test file & controller