Merge "Fixed some test failure and log warnings."