More tests.
fix all the tests I just broke.
unbreak my heart. undelete my code.
cleanup. these tests require the fixtures, so use them and all the fixturey goodness.
more and better tests.