Fix test redifinitions

A few testcases had duplicate names, which caused
the original test to be redefined and not executed
anymore. Also one case was apparently entirely duplicate.
Raises unit test coverage by two tests.

Change-Id: Ibf3db93b7fee875877c1bac8797eb88fc9a99874
Merge "Fix test redifinitions"