[BUGFIX] Split off functional category collection tests