Adds test for queues
Fixes test for empty queue
removes unused ifdef procedures