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.
Hi @donsalvadori 

Sorry about the late reply. I hope you are well.

You may want to delete those details as this is a public repo :)

Have a great xmas