Merge "Use getter methods to verify the fields of Entry"