Controller test suite created (not functional)
Merge origin/master