Added unit tests for FeatureHelper, modified FeatureHelper