Add tests for #2300