Removed TestName and did some clean up.