Refactor expand tests slightly to handle errors better

If we get an error relating to our manipulation of the temporary
directory or cwd, we don't want to run the rest of the tests that assume
it worked.
Report expand errors better in fish tests

Print the expected and actual results if an error occurs.