Adding some docs
More test tweaking