added remove_suffix_filter and tests