Minor changes to fix a few tests.
Primary reasons for failure are related to processcontrol.
This one needs a thorough overhaul anyway.