Fix FeatureSplit tests to work properly with Java code

Change-Id: I2f6d770c860c05e0d5a407fd76dc59dd748e3c3f
10 files changed