Splitting update queues (last test fails)