Mweb 644

@nandy-andy @RafLeszczynski @rogatty
I think we can add here small unit test :japanese_ogre: