Refactor tests 6