working on tests
getting rid of unnecessary lock object