Adding more tests for #2772