SES-146 Fixing unit tests.