Ensure unit tests work with all interface types

Fixes bug 1167520

Change-Id: I42ed3a5718d771924caffba3f58340e7f1d2e2ad
Merge "Ensure unit tests work with all interface types"