Analysis, tests fixes

Reverting some previously made changes, trying to stabilize PrismFeedReplicationUpdateTest (tested few times, passes)