Fixing up expected files further