Slightly clean up argument handling in join_features and filter_features

- Also clean up test formatting a bit