Fixed syntax issues to get tests running again

Have a look through the diffs to see what changed.
It's mainly syntax tweaks, but I also fixed up your association.
yikes. I hate it when I make these errors! I feel dumb. Maybe was listening to David Bowie too loudly here...