Refactored filtering mechanism and test list collection.