#405 Update test
#404 Improve OneToMany Map handling