Improves test for travis-ci