Skipped previously unskipped flaky tests and did some minor corrections on TestExpectations.