yes, I know, but it is out of this pr that just add unit tests. It could be implemented in other different patch.