[ticket/365] Fix tests due to controller helper changes

B3P-365