Merge config from different locations correctly

Change-Id: I205446e54fab1fb917875edcde87a93ad18454de
Remove random test data

Change-Id: Id7fc9b59d0cf7ac871dd2baeabdc6dcdbe97ff2e