SES-87 Updating JUnit tests.