Resolved review comments. Updated test case to use new listener interface.