Basic testing in place
Merge pull request #108 from jasonerpenbeck/test

Basic testing in place