some refactoring and remove restriction in previous tests that journey stops should not repeat