[fix] Parser fixes, it was cleaning to much from the queue.
[test] Added tests to ensure that the queued