Filter test merge

Rendering has been fixed