Update the unit tests based on up-to-date model implementation
Update the unit tests based on up-to-date model implementation

vistadataproject/nonClinicalRPCs,vistadataproject/nonClinicalRPCs,vistadataproject/nonClinicalRPCs