GH #152 - Fixed failing tests.
Merge branch 'dsuch-f-gh152-soap-suds' into u/fbr1