More granular association blocks

* Create separate spec blocks for each group of associations