Fixes to dap4 testing