Simplified filter names and added factory methods. Updated readme
Updates some tests to use new factory methods