Corrected failing tests