(Just moved common 2.3.20 and 2.3.21 method call tests into a common file.)