Update

- Refactor some managers
- Some tests #24 
- Fixes