Fixed failing tests on travis-ci