improve tests... maybe will pass travis