Named all signals, give test-points meaningful names, removed CMPCS test-point