Added tests

Change-Id: I9083df82461587381d8716ccfef9ab827d8f13c4