Fix tests for a problem occuring with a specific test order.