More testfix.