updating unit test for session.
Merge branch 'schedule_timer_change' into old_unit_tests_update
updated unit test and some bugfix