Few tests fixed