Swapped last deadlock test to use new Locks API.