Fixed docs and tests