Fixed regressions in test.