Added tests
Merge pull request #126 from tomvantilburg/master

Added tests