unify configuration for test

Change-Id: Ia20e0fc8f328b3ea727b142c1c4d16b48e300617
Merge "unify configuration for test"