Merge pull request #27 from mineiros-io/extended-tests