For ENG-4999, reorganize unit test