test: remove duplicate tests

Signed-off-by: Trevor Norris <trev.norris@gmail.com>
Merge remote-tracking branch 'upstream/master'