Test codes improved.