fixed all broken test