Peer review changes
Fix tests and cli sessions.