Add resolve/unresolve API bits and test them.