started refactor of feature_class_tests...