Reindent the oncontroller_testsetup

This was insanely difficult to read with the massively broken
indenting..
Merge pull request #123 from dirkmueller/master

Reindent the oncontroller_testsetup