Merge pull request #71 from danmergens/master

test cases and edex tool fix