Updated documentation
Fixing up dependencies and tests