Fix most tests. Start session token parsing