Improved unit-test coverage of "Queues with cleanup heartbeat above zero are not being picked for cleanup"

Summary

This commit improves the unit-test coverage of the queue cleanup issues fixed in !197 (merged).

Requires manual tests in pre-production

References

Closes #322 (closed)