Removing early failure.
Removing cruft around filtering
Added Seth's tests.