reign in drinks trigger and update tests
move more triggers to startend
Merge pull request #968 from duckduckgo/zaahir/drinks-trigger-update

Reign in drinks trigger and update tests