[MRG] Simplify test commons

Ping @amueller, @kylekatsner
not mine :p