Fix tests and remove nit comments
Add additional fields after merge