adding unit tests for concurrency control now...
added unit tests for update testing
Merge branch 'feature/unittest' into develop
Merge branch 'develop'