Fix Javadoc
Add tests for filters