Clean test + fix listeners. v0.2.10