Fix other impacted unit tests.