Added some unit testing
moved tests into separate files
Merge branch 'master' into testing
modified tests for updated master
Merge pull request #22 from ngds/testing

Testing