Adding associations to solution_spec and cleaning up some awful old scopes from solution.rb