Fixes for unit tests for removal of change address cache.