Drop unnecessary listeners etc. from tests