[#2125] Fix group and organization tests