Issue     : Some tests failed after push to trunk
Solution  : Fixed issues occured on trunk after push