SAHI - fixing tests to work with new look&feel
All changes should be backward compatible