Reorganized and started fooling with minitest.