Adjusted test annotations to include both - JSF22Only and Smoke categories