Updates to goldmaster file

Fixing some of the auto generated text and whitespace. Unsure how I feel about
the whitespaces changes here, but I think that can be cleaned up at some
future point.
Tests should clean themselves up

No use having a bunch of generated files cluttering up the fixtures dir.

Might be nice to actually force this to happen in a clean temp directory, but
in the mean time, this isn't so bad.
Make tests more realistic