Fix tests also make sure this thing works with travis