Test renamed
Merge branch 'Categories'