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.
Yep, it just makes it easier to see if you've got your block ends matched up correctly.