Added categories to separate out UAT tests