Fix controller helper tests