CS Fixes and test data upserts