Fix tests, make WFS more functional