fix things test
synchronize the adding and removing of listeners of base push condition