adding time logs
adding test cases
updating tests
Merge remote-tracking branch 'origin/master'