test-run support added to dvr and some extra trapping