Refactor tests
Ability to pass options to column names filter