populate fix & tests