Fixed failing travis-ci tests