few tests fixed
tough work, next few tests fixed