DRY up tests; add commitratio