Fixes one-to-many and many-to-many

Updates with feedback from immoh

Added failing integration tests