Broken tests have been fixed, corrected and organized.