stats: include current drink in query set.

Also fixes some flaky tests.