[TMorris and BTeng] fixed the test issue