remove collection association
remove << from delegate and use custom def
formating fix to mock template