[PLAT-6140] Tests for underlying builder classes
[PLAT-6314] Inconsistent equals and hashCode