Adds test fixes to Filter and WAf to fix failing tests