Execute listener in right context and update tests