Merge pull request #27 from Sirupsen/more-tests

More tests