Several tests need to be adapted, because they were implicitly making the assumption that there is no auxiliary variable. Incidentally, this closes #1731. This commit therefore also removes the workaround introduced in 0391dbbeb1.
0391dbbeb1