Merge pull request #67 from configit/reinclude-the-tests

Reinclude the tests