Add homogeneuos and heterogeneuos tests