more reorganizing of step definitions and tests