Add order for categories
Add some tests
Simplify some queries
Reorder dependencies
Fix Composer file