Fixed tests + travis