fixed some tests failure cases