More filters, fixed issues with extending generators, and added basic filter tests.