Fix populate and user spec