Fixed minor regressions in test code.