Differentiating between a 404 & 405 when `catchAll` is active

Fixing a test

Tweaks

Fixing checks