fixing the tests and pushing the journey object down to reduce connascence