Getting ready for 2.10.1, so minor reorgs, more tests