Tian

Enhanced testing. Grant or Ariel, one please review and merge.