Added tests

Change-Id: I23ea896bfd317120f9f345363eada0ef4891d7e5