Merge "Add LightingFilter behavior test" into nyc-dev