code style fixes
Session init listener
fixed tests to pass