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.
You only need the `{}` if you don't define any properties. One has properties, so it's only needed on two.