Cleaning up tests.
Merge branch 'master' of https://github.com/egreene/PracticeGDVP