Added a new test and cleanup of queue to fix #1