fixed some tests failures