Fixed session w/tests