Corrected broken tests...