Add tests, package