Merge "Add test coverage for update: SOA and NS managed records"