Added session support to the tests
Got all but one test working