fix travis and tests