enabling tests on new api
applying requested changes
Merge pull request #22 from narkisr/locks-2

Add lock tests
Locks tests housekeeping