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