Migrate test from 1.x to master and make them work
Merge pull request #13 from Gomez/master

Migrate test from 1.x to master and make them work