Improve intercept test

Signed-off-by: Eli Skeggs <skeggse@gmail.com>
Make callback to resolve optional

Signed-off-by: Eli Skeggs <skeggse@gmail.com>
Fix intercept order

Signed-off-by: Eli Skeggs <skeggse@gmail.com>