Added controller boolean
Merge remote-tracking branch 'origin/master'
Changed the testmethod to adapt to the new controller boolean