More tests/refactoring for substeps nature prompt