Updated some of the documentation and tests