SOAP-2217
Pushing incomplete unit testing work in progress.