Modified tests, added session stuff.