lock tests improvements