add machine key, change row key to be Guid, add some tests