Fixed old test code. No major change.