Accomondate the new paths of method listeners in test cases at master.