Tweak some test settings

Change-Id: Iaf0dd9d9d29916606ed2fb11d495f81c9f06229a