Move over to using new PacakgeType

and fix all the tests which now seem slightly more sane