Fix test refacto..