[ticket/416] Improve controller helper test coverage and fix coding issues

B3P-416