start refoactoring
clean up if else a little in sessions create
remove unneeded tests and fix others
Merge pull request #100 from henrytwang/fix_test_after_refactor

Fix test after refactor