Added additional tests for new featureset