Clean up the 'queues' package for tests

Partially-Implements blueprint: notifications

Change-Id: I768fcbc6266c737894ff2489049d3535df22e80e
Merge "Clean up the 'queues' package for tests"