added tests
Merge pull request #1 from drmanitoba/master

Added tests