Merge "Remove test duplication between tempest and n-t-p RoutersDVRTest"