Reindent the oncontroller_testsetup

This was insanely difficult to read with the massively broken
indenting..