Improved usage of queue
Separation of some concerns (persistence)
Interleaved (parallel) test