Corrected most failing tests