Tests added
Merge branch 'front-end-controller'