Adjusting tests to new lock scheme