[MRG] Simplify test commons

Ping @amueller, @kylekatsner
*cough*