Issue #74 got out of the unit tests, ready for the lab tests.
Also, general refactor of filtering. Reviewed the API and added
enough Javadoc.