Update unit tests to work with new locking code.