SOAP-1769 Improved feedback when testing scripts and information messages etc.
SOAP-1769 Fixed merge conflicts