further test fixes for Test::Trap
upped version