Package improvement and tests