Using getDestinationInsertionPoints() in tests. Other tweaks.