Remove unused methods
Add tests