Added packaging, tests