Test adaptation for travis-CI