Added a couple more tests for the fix for #2262.