Update tests and fix a few comments.
Fix default lock and split it off.