Add test case for #10393
Fix failing test in base_test.rb which started to fail due to c319aa8d2ade31548d59b0e2d915124605c33e43