testing framework for controllers
Merge branch 'CORE' into CORE-dev