Merged in test case for 1.3.20