am 8234f20a: Update the test configs to match the new layout.

* commit '8234f20ae712e95ececf56ea3d03204eaf6fdc9b':
  Update the test configs to match the new layout.