Add tests for #23364