Simplify unittest/common