Fixed comment

Change-Id: I1c5a62986c14ffabab2dc1112f8c94264dbc27b0
Add tests change config loading logic

Change-Id: I4b6e1eb231904f5af207503acf0f9769ef641c4b