Controller test improved, CS & DocBlock fixes

@dereuromark could you create a release tag after merging this and may be cherry picking some of the commits to the original repo?