Added categories to tests