Minor improvements to tests
Merge pull request #2 from MatthewRichards/TestFramework

Minor improvements to tests