clean up and externalise tests
2.3.0-pre1
Merge pull request #14 from rvagg/clean-up-and-externalise-tests

Clean up and externalise tests