Fixed more tests
Skip fix if not running in travis