fixed all ze failing tests