SCAL-306: checked and reorganized controller tests