wip: Start migration of tests to the new resolver