Additions for testing locking