Updated several tests to the new class hierarchy, and fixed a few small bugs.