fixed  failing tests