Update tests
Beautified
Update journey tests
Add commuter tests