Add upsert w/ test