Fix for RuntimeException in test suite.