Tests for datadir parameter
Now without the merge conflict stuff
Merge pull request #18 from bkkrw/master

Tests for datadir parameter