Fix yet more deprecated step definition calls.
Fix yet more deprecated step definition calls.

oneclickorgs/one-click-orgs,oneclickorgs/one-click-orgs,oneclickorgs/one-click-orgs,oneclickorgs/one-click-orgs