Added queue tests
Cleanup