Refactor descriptor resolver tests.