FeatureBuildTest related fixes