fix: tests, documentation, and a small bug fix for resolution

Change-Id: I29d4fc5381bdbbacededabf701efc8ccb6fbcb62