[FIX] Fix some failing tests
[FIX] Change path to DEQueue data structure