Fixed cyclical graph issues with saving in the ORM

Also fixed issue with loading Map properties.
Started moving over the last of the ORM tests.