SES-1901 fixes for test failures
Merged in ses-1901 (pull request #215)

SES-1901 fixes for test failures