Ugh, sorry, but the session-based client test do provide a mock session, so need to keep this code for now.