minor cleanup on heterogenous test