Fixed Tests for travis-ci