Making sure we add a real test suite

Change-Id: I024d8629be2fe013e71be92e6afeb7012a916d8c