Fair alternative #336 other categories fix
fixed tests