Updating docs
Fixing types and orphan instances in tests