Merge "DeploymentInfo tests and construction improvement"