Fix deadlock at swap phase caused by lock escalation

Isolation tests are re-enabled.