refactor existing session tests to be a bit clearer