Added tests for 21866,21508