Fix of issues with sentest dependency.