Clean up tests.  Use my utils instead of the stuff I had in here before.
Fuck yea.