Add middle stage to journey tests, change layout