Fix multiparameter querying and add fixtures