Add lock tests (incomplete)