fix remaining tests
rm dbg