Fixing regression tests for update and replace