for merging to the master
Fixed merge conflicts, added mock test