Add resolving tests