Write tests for the new listeners