added session logout/destroy functions and unit test
fixed conflicts