Notes and splice in new low-level white box tests for AddressTokenResolver.