Add tests (#4182)