Fixing more customer tests and making them deterministic.