Fix failing tests caused by write queue