add query option and missing options tests