Build avoidance

We continue with some more build avoidance fixes for test cases.

/Jonas