add lockmap and test