Faster unit tests
Merge pull request #74 from nicholas-leonard/fasterunittests

Faster unit tests