add omitempty to Options structs

we're not actually testing if empty values are being omitted yet, but
udpate testFormValues to easily check this in the future