Add buyer_email field + update regression tests