Fixed tests after Organization column name changes