Add tests
Update package name