UT : Update to use some configs files

Change-Id: I20d4c0c6e40bbdb1a7766766803b4d3f96097409
UT : Forgot an endif

Change-Id: I6b63b91a8eb0e6424205dff22319fea6a4163109