fix tests
Merge pull request #1 from kwonglau/master

fix tests
Merge pull request #4 from Ticketfly/master

fix integration tests