clean up the upser executor and use the same schema for update inside upsert
Update the test cases to get info before executing the upsert query