Added tests for #8930