Add the ability to set the old-locking flag during test