Fix filter options test and rename