Feature/848924/dpx tests