Minor changes to the d2 test