Various fixes
OneToManyReader Unit Tests