decruftification
more decruftification
clean up the tests so that they now work