Removed some docs
Refactored docs and tests