fixing session tests and active state updates