WFS: adjust and add expected results