Build the right tests

Change-Id: I8a8f77b13961a3495cf97280e46e4f0449389b12
3 files changed