Cleanup
Add tests