Update packaging, add tests