feature.Feature much more flexible now; plus tests