few tests fixed