#109 - content manipulation API lock implemented with part of unit tests