some tests fixed