more robustness in lock test.