Added a few test modes to test ESI bug on beta - should be reverted

Change-Id: I566457fdf9de1abb2df126b21303e2fa6ea747d7