bugid-98974 | S:MTb removed old [fixed unit tests]