Adds fixes to filtertests and Waf tests.