Some Improvements for WFS Tests