Added tests to WPS request builder and did some minor fixes