Change-Id: I2415dbae9c2a2ac5951b9e9176a514a1d1330ab0
Interface can now have unit tests so I have added them. Change-Id: I6fba1ae6cb428c7f73446d051bf05657aba57ba2