faster test related to #108
Merge branch 'develop'
locking improvement #108