Moar dtest inclusions for 2.1/trunk