Fix categories errors and testing notification
Merge remote-tracking branch 'origin/master-qa' into cdominguez