Reimplement param building methods, MetricData test coverage

Change-Id: Ic86ffabd3804322cd9dcc6ad5c69458f3cb5a2da