some more validation in WPS builder and tests