Added fix that ensures testing consistency.