Unreviewed gardening. Skipped failing tests and added new baseline to failing but correct tests.