Revised packages and updated tests