Fix tests for Travis-CI build
Merge pull request #570 from redapple/travistests

[MRG] Fix tests for Travis-CI build