Merge "Make unit tests use new entry updating method."