Fixed potential problems with global CONF in unit tests

Change-Id: I97aca3c643095463d376756b3beb0da147420865
Merge "Fixed potential problems with global CONF in unit tests"