Unreviewed gardening. Added new baselines and skipped some failing tests.