Refactor homework tests