@havvg so you are ok with adding those tests?