Revise to include "default impls"
Revise test further, expand on matching procedure