Test code clean up.