SessionCreationStep, SessionParameters, general refactorings, not
finished
further refactoring
Fix tests after refactoring