UT : Re-organization (help from CM)

Change-Id: Icbe4df32106ce16298da287c5aa781698445a7fa
UT : Miss copy/paste with egl configs

Change-Id: I1874d62584551ae04dae7c72553d2efcfa010fe4