Remove duplicate test definitions

A few functions were duplicate, apparently merge errors.
Remove them.

Change-Id: Ifa23eb1fe5a5782101491be6b90ee9bed1e41b1b
Merge "Remove duplicate test definitions"