Fix CS issue
Add exception for missing queue
Start test for queue