- Fixed tests
- Some work