wip: fix DtpTest errors.