Eliminate Test code