Add resolver & matcher tests & cache listener tests