Leveraging inheritance to simplifiy filter models. Updating numerous specs for compliance (passing 53%).