Continuation of code refactoring to make more sense of scenarios and to better cukify things