All tests work.

Got all of the tests to work, along with a few extra.