- Fixes

- Fix tests
- Rename scripts directory