Some tests in progress for repository layer

Change-Id: Ib767a1131082c25d55db80cc7d1007cc8cb7011e