Fix tests failing on Travis

This reverts commit adfa53f95a54f1ac6227ef0359aa9ffc79b7a5d1.
Merge pull request #18 from jstasiak/master

Fix tests failing on Travis