Fix a few more easy ones
Go back to %cheese.txt.spt in a few tests