Fixing strict errors in AbstractControllerTest, fixing wrong code coverage including tests
Merge remote-tracking branch 'origin/master'