Test: cleanup CL, existing unit tests still pass Change-Id: I29e2ef36aad23e2e2a23617455be9348847c2d19