Remove unnecessary expect
Fix test based on previous update
Merge resolution
All green
Bar now tracks discount exempt drinks and tracks the popularity of drinks during and outside of happy hour