Testing with Directory providers
Simplifying the Queue code