Some improvements for WFS tests