some tests fixed
some tests fixed