Add in some extra tests from some of the other forks.
Some comment cleanup from some of the other forks.