upsert support and reorganize tests
bump version