Mild refactor of WAFTests