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.
Styling? I know many ruby coders only like 2 space indentation. I have not personally adopted the practice yet, but I will soon since it's best practice.