Update tests, fix flapper in the same way
Fix receiver in the same way