Added packaging, including tests