Missed an entityType for ee2191c
Corrected test assert descriptions
Revert "Simplified how one-to relationships are stored, there is no longer a need to store the type on the object table"

This reverts commit a47153b9a9b7d4ebfc15fdb427a1d82a2974379f.