WIP
Add tests for populate.