Adding all necessary voucher fields, plus tests