Tests passing on 2.6.0