Move uuid insert of json, break down tests