Refactor old test