fixing tests, adding correction conditionals for locks