Controller Tests Refactoring
Merge branch 'jsapp-master-merge' into jsapp