add tests
Merge branch 'testing-and-refactoring'
Merge branch 'master' of github.com:tumf/gargor