Start a testing folder, move existing corgi test there
Begin moving reused code to own method.