Fixed issue where second queue was not dequeued completely

also added tests and removed zippers