Fix tests for csv uploading

This brings tests up to date with our current models.