Added tests

Change-Id: I15ed441d58043a3b6e2024209f5b566eeab637fe