Updated to handle association.
Fixed regression in one-to-many association tests