[BZ 1120418] more refactoring to be able to verify step execution