finish locking strategy impl
fix build problem for locking tests