fixed tests + travis?