Rename and other CDI & JSF tests preparation