Add packages for testing
Add tests