Add testing - WIP

Change-Id: If720e9cea6c6af80114d1cf2a88461e22a0ec335