Testing 1021

Test cases for #1021