Change access modifiers
Add tests