Fixing tests
Updating the documentation