Enqueue fixes, Enqueue test scripts