connect WAF with Listener
clean code
add another test