FeatureTest

update, minor changes.