Fixes for some brittle tests