di-set tests: Refactor.