cleaning up test code
abstract the filter/group functionality to work with feature labels