Added tests for 21866, 21508, 21986, 21989, 21990