reorganised test order
adding filters to query