I do not see any unittest for this new functionality... is there?