fixed #25
fixed session problems on testing