WIP: simplify Queue benchmark
Add tests