fix package creation so it doesn't clobber stuff
some more tweaks to Test::More