Add tests with collapsed forwarding