Removed 'optimization' to prevent extraneous queue creation. I don't understand what it was supposed to do and it seems unnecessary. It's also the cause of the test failing.