Re-improve the packages and tests