Added logout feature and UT