Add a bunch of new tests, mostly they aren't linked yet.
More goodness, and link up a few bugs.