Fix test failures related to "step one" form changes