+ add homogeneity tests!
* cosmetics