added test for UniqueQueue
removed dead code
restructuring, restructuring, restructuring...