Fix travis

Why again do we need a unit test for something that was never used?
Merge remote-tracking branch 'scrawl/master'