More changes to challenges to match the spec.