Fixing test errors
Removing @@ syntax, learned about _.bindAll...