USE EXPECT_STREQ other than compare them by hand
Merge branch 'dev'