Added a bunch of stuff.
Fixed some test stuff.
Fixed some test stuff.