start controller testing
Merge branch 'controller' into dev