Moved grouping by sentiment into model to keep controller lean. Some test cleanup.