squash! Updated structs and tests. Updated structs and tests. Signed-off-by: Frank Davidson <davidfr@americas.manulife.net> Signed-off-by: Frank Davidson <ffdavidson@gmail.com> Signed-off-by: Frank Davidson <frank_davidson@manulife.com>
