- Changed libs
- Corrected tests