Refactor of WafTests for angular update