Improved Session/tests