Bug fix

Change-Id: I6c9571000d9eaa00ff5f92342fbbdd4a9fafa788
Working on mocks.

Change-Id: I4d640d89f0014e40ee681d05cabba25246e0fbb6