Decouple && test

Also new matching for requests