Adds test fix to WafTest, should all be working now.