Merge "add support for testing testFeatures()"