SAHI - fixing tests to work with new look&feel #4