Fix DumpListener and add Test