Start on locking, fix some tests

Locking not yet done, general read lock might not be such a good idea,
have to consider different path.