Remove \ from uses
Add tests for Populator
Reorder uses