Adding more docs and tests