Merge "Fix FeatureSplit tests to work properly with Java code"