Add a few tests
Add some queue tests
Add some more tests