all current locking tests pass, only a few more