Clean up merged features, move results to separate struct.
Remove hook anti-pattern.
Move test filtering to separate method.