Add a test case for ENG-5311