Refactor and specifications
Refactor and specifications
Temp translation fix
Correction on batch size for categories
Correction on assertion