tuannv_ commit , add more unit test
Merge remote-tracking branch 'origin/master'