Tests passing for 2.4.x and 2.6.x