Cleanup the tests to avoid duplication
Merge pull request #42 from calexicoz/master

Refactoring of the tests for UUID support