Create unit tests for update of fieldmap block information

GCP-9732

Reviewer: Aldrin Batac
Add curly braces to if-else statements, remove commented codes, unused variables and methods.

GCP-9732

Reviewer: Daniel Jao