add dedicated unit tests