Tidy up some test profile things.
Merge pull request #51 from csmith/master

Tidy up some test profile things.