Update

- Refactor managers
- Some tests #24 
- Fixes