Unreviewed gardening, update expected files, simplify TestExpectations.