Fix UnexpectedError4
Fix UnexpectedError7.txt
Fix MultipleControllers7
Take some passes out of the test template...
Do less work
Fix MultipleDGI tests