Rationalise naming of test outputs; fix missing check of dcp_test2.