Refactor them test