Improve tests and add 1.9 support
Merge pull request #2 from xaque208/bettertests

Improve tests and add 1.9 support