For ENG-4537, remove test only code