More packages and tests