Unreviewed gardening. Skipped flaky and failing tests, added new baseline to one correct test.