Unreviewed gardening, update expected files for passing tests.