Added more asserts to the tests

Change-Id: If018964d379310fac756ef724baa514a3d50d277