WPS4R integration test fix

Merging all changes and fixes by @matthesrieke - closes #27