fixed bug in FeatureSet merging.  made the related unit test better