Additional specs and fixes to association handling