Merge "Add assumption for dvr tests"