tough work, next few tests fixed