Merge changes I836a2523,I2826f710

* changes:
  add more tests to instant mode
  Migrate tests to instant mode