Updating some tests
Updating docs