Hopefully this fixes the issues caused to test_populate.py due to my recent refactoring.