Fix container ref generation
Update test data generation
Merge pull request #5 from jayrobin/fix-container-refs

Fix container refs