For ENG-5605, remove unused arguments and add temporary debugging for system tests