Fixed master

Re-updated docs and tests. I hate Git.