Refactor freebase unit tests
Unit test for #82
Merge pull request #83 from ovatsus/master

Missing unit test for #82